From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 16:25:42 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=042cbea14ec32d91ccb99115f81814f508b8603b;p=emacs.git

merge from trunk
---

042cbea14ec32d91ccb99115f81814f508b8603b